From: Georges Basile Stavracas Neto Date: Tue, 21 Aug 2018 09:48:19 +0000 (-0300) Subject: appMenuButton: Rename show/hide to fadeIn/fadeOut X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~897^2~1^2~96 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=dd4709bb2;p=gnome-shell.git appMenuButton: Rename show/hide to fadeIn/fadeOut In the next commit, we will turn PanelMenu.ButtonBox into a St.Widget subclass. As a domino effect, PanelMenu.Button will become one too, and so will Panel.AppMenuButton. When that happens, the current show() and hide() functions in Panel.AppMenuButton will clash with Clutter.Actor's ones. To avoid that, rename these functions to fadeIn() and fadeOut() and avoid a name clash. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/153 --- diff --git a/js/ui/panel.js b/js/ui/panel.js index 27ebec322..b6e831069 100644 --- a/js/ui/panel.js +++ b/js/ui/panel.js @@ -149,7 +149,7 @@ var AppMenuButton = new Lang.Class({ this._sync(); }, - show() { + fadeIn() { if (this._visible) return; @@ -163,7 +163,7 @@ var AppMenuButton = new Lang.Class({ transition: 'easeOutQuad' }); }, - hide() { + fadeOut() { if (!this._visible) return; @@ -314,9 +314,9 @@ var AppMenuButton = new Lang.Class({ shellShowsAppMenu && !Main.overview.visibleTarget); if (visible) - this.show(); + this.fadeIn(); else - this.hide(); + this.fadeOut(); let isBusy = (this._targetApp != null && (this._targetApp.get_state() == Shell.AppState.STARTING ||